From c0e4a0d66b023712e1ea6ab77bf4a6917ba5e93b Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Fri, 9 Jan 2009 03:22:30 +0000
Subject: [PATCH] Fix merge error.

---
 lisp/gnus/ChangeLog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2e9badd2598..81373d0275d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -122,10 +122,6 @@
 
 	* mm-util.el (mm-charset-override-alist): Declare for compiler.
 
-2008-12-16  Glenn Morris  <rgm@gnu.org>
-
-	* mm-util.el (mm-charset-override-alist): Declare for compiler.
-
 2008-12-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs
-- 
2.30.2